Merge from emacs-24; up to r108065
authorChong Yidong <cyd@gnu.org>
Fri, 6 Jul 2012 04:33:03 +0000 (12:33 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 6 Jul 2012 04:33:03 +0000 (12:33 +0800)
commit07cdaad2ca043dd065ad961cce8906b45277a1cf
tree1f6e7a5f0c328b34a2d22d2a31be62997b42c850
parent4b3cd8f4ffa6c06cb03b888988224246b93f6f5b
parent6cec074f994813fa5763b379f29412d51c5ead92
Merge from emacs-24; up to r108065